Auto merge of #1730 - alexcrichton:update-docopt, r=alexcrichton
authorbors <bors@rust-lang.org>
Wed, 17 Jun 2015 22:56:29 +0000 (22:56 +0000)
committerbors <bors@rust-lang.org>
Wed, 17 Jun 2015 22:56:29 +0000 (22:56 +0000)
Closes #1720


Trivial merge